fix(userconfig): duplicate core lexicon #54082
Merged
+7
−48
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ArtificialOwl
force-pushed
the
fix/54080/using-userconfig-to-set-lang
branch
2 times, most recently
from
f29afc1 to
cff6c80
Compare
ArtificialOwl
requested review from
Altahrim,
artonge and
leftybournes
and removed request for
a team
susnux
approved these changes
Jul 28, 2025
Signed-off-by: Maxence Lange <[email protected]>
ArtificialOwl
force-pushed
the
fix/54080/using-userconfig-to-set-lang
branch
from
cff6c80 to
132513d
Compare
provokateurin
approved these changes
Jul 29, 2025
Merged
4 tasks
Contributor
|
@ArtificialOwl would backporting this to 31 fix the same issue that some users are running into with the user's language? |
Contributor
|
/backport to stable31 |
|
The backport to # Switch to the target branch and update it
git checkout stable31
git pull origin stable31
# Create the new backport branch
git checkout -b backport/54082/stable31
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 132513db
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/54082/stable31Error: Failed to check for changes with origin/stable31: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
duplicate config lexicon for core
should fix #54082